Handle base_path being null in the rest of the cases (#310270)

2005-09-02  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkfilechooserdefault.c: (shortcuts_add_volumes),
	(shortcuts_activate_volume):
	Handle base_path being null in the rest of the cases (#310270)

diff --git a/ChangeLog b/ChangeLog
index bb88c89fcaaa4e9d76d012941b78dfcc2cba9893..7a24e7d74bd3b8d0dbe674f475d0656d3b52fe39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c: (shortcuts_add_volumes),
+       (shortcuts_activate_volume):
+       Handle base_path being null in the rest of the cases (#310270)
+
 2005-09-02  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Keep track of

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bb88c89fcaaa4e9d76d012941b78dfcc2cba9893..7a24e7d74bd3b8d0dbe674f475d0656d3b52fe39 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-09-02  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c: (shortcuts_add_volumes),
+       (shortcuts_activate_volume):
+       Handle base_path being null in the rest of the cases (#310270)
+
 2005-09-02  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Keep track of

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 49dd51668f93dfadf51b095736659c04a25e4efa..a49e2f1bb2d4912088761e1d0fc83f0981f50a7a 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1617,13 +1617,16 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl)
       if (impl->local_only)
        {
          GtkFilePath *base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
-         gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
-         gtk_file_path_free (base_path);
-
-         if (!is_local)
+         if (base_path != NULL)
            {
-             gtk_file_system_volume_free (impl->file_system, volume);
-             continue;
+             gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
+             gtk_file_path_free (base_path);
+             
+             if (!is_local)
+               {
+                 gtk_file_system_volume_free (impl->file_system, volume);
+                 continue;
+               }
            }
        }
 
@@ -6645,8 +6648,11 @@ shortcuts_activate_volume (GtkFileChooserDefault *impl,
     }
 
   path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
-  change_folder_and_display_error (impl, path);
-  gtk_file_path_free (path);
+  if (path != NULL)
+    {
+      change_folder_and_display_error (impl, path);
+      gtk_file_path_free (path);
+    }
 
  out: